Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 29 Jan 2010 11:13:16 +0000 (06:13 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 29 Jan 2010 11:13:16 +0000 (06:13 -0500)
commit341389a459425c821c3a48f1b73bec4fbb5b71fb
tree5197c0fde76f779bc7dbd175b0b8215682b2de63
parent50bacff95182f3a2adbaf30c440ca8fecb8b5473
parentd8ba94c652061fc003efeac00630cfdba858f52f
Merge from mainline.